[6.0] Fix –-toolchain value shadowed by local executables
#7485
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci test |
MaxDesiatov
added
cross-compilation
test suite
Behavior of `--toolchain` regressed in #7296 by preferring the first match in toolset root paths: when `swiftc` is available in the same directory next to the SwiftPM binary being invoked, that became preferred with `--toolchain` value ignored. This is now fixed by slightly tweaking where custom toolchain gets added - it's prepended. A newly added test verifies that the behavior is fixed. For that we had to inject `FileSystem` and `EnvironmentVariables` in a lot more places, with an added benefit of making our tests more consistent and isolated from an arbitrary build environment. Resolves: rdar://126095653 --------- Co-authored-by: Pavel Yaskevich <[email protected]> (cherry picked from commit ee9d0b2) # Conflicts: # Sources/PackageModel/UserToolchain.swift
MaxDesiatov
force-pushed
the
maxd/test-toolchain-argument-6.0
branch
from
968bde4
to
503eff0
Compare
MaxDesiatov
changed the title
–-toolchain argument in SwiftCommandStateTests–-toolchain value shadowed by local executables
|
@swift-ci test |
|
@swift-ci test |
|
@swift-ci test windows |
bnbarham
approved these changes
Jun 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick of #7483.
Explanation: Behavior of
--toolchainregressed in https://github.com/apple/swift-package-manager/pull/7296/files by preferring the first match in toolset root paths: whenswiftcis available in the same directory next to the SwiftPM binary being invoked, that became preferred with--toolchainvalue ignored.Scope: limited to cross-compilation and infrequent builds that utilize this option.
Risk: low due to limited scope, merged to
mainfor a week with no regressions discovered.Testing: A newly added test verifies that the behavior is fixed. For that we had to inject
FileSystemandEnvironmentVariablesin a lot more places, with an added benefit of making our tests more consistent and isolated from an arbitrary build environment.Issue: rdar://126095653
Reviewer: @bnbarham